fixed timer code

fixes to timer
fix to shifting out items too soon