More rewrites. Fixing input, added collision response for certain situations