Changes to save code space; cor xy; other misc changes
Merge pull request #90 from jetty840/dnewman-merge

Changes to save code space; cor xy; other misc changes