add fixedFramerate
add collision back