Even More Tweaks!

Moved some stuff around.