Fixed timings for older pc's

Also cleaned up the code a little more