renamed file.
Minor changes.
Fixed some timing stuff.