Merge pull request #2 from DanGrayson/master

merge fixes after removal of canonical structures