Added mass, background, and friction. Improved collisions code