Minor changes and some new TODOs from code review with Tom.
Merge branch 'master' of https://github.com/simbody/simbody