minor
A bunch of new stuff
Merge branch 'master' of https://github.com/flinder/Rationalization