Big Update

Weights, Timings, Etc.
Slight fixes and graphics

Nothing too important.