More tweaks (Sorry for tweak spam)

This is insane.. the tweaks are coming in.