cleanup
fixed elapsed time