Code review! Minor edits and changes.

Might be broken - testing time!
Merge pull request #1 from ertyseidel/master

Code review changes