indention, collision and velocity fixes