Minor Fixes

One or two small bugs fixed, some vestigial code removed...
Merge pull request #1 from edthebat/master

Minor Fixes