Fixed a little math error and messed around with timestamp stuff