Fixed collision, movement is quite fluid now