lots of small fixes, plus trying to get bouncing to work with mass (commented out atm)