move moving to elapsed time bug fixes