A lot of minor optimizations.

Mod Edit: timing scheme modified, time has been updated to 2:08:53