Fixed some timing stuff
merged changes