Movement nicer, but collisions still messy