Simple type tweaks
Merge
Merge branch 'master' of https://github.com/jamesdphillips/ml-staffer
New styles
Merge