cleanup and small fixes
Merge branch 'master' of https://github.com/icd2k3/canvas_physics