regoranize some modes
Merge branch 'master' of github.com:treeform/polyspace