clean version
More input/physics done
quick checkup
Merge branch 'master' into parsing