cleaned out old unused parameters, fixed timing system