A few small changes

Just getting oriented to the repo, and fixed a few things up. Commit history has details of each change.

Please just yell if you have any concerns.