Syntax fixes
Merge branch 'kevin-partition' of https://github.com/mplewis/olivaw into kevin-partition