I lied

I worked on this some more after all, and since it hasn't been officially critiqued yet I will probably end up changing it afterwards again... but I am happy with the changes thusfar.