Code review! Minor edits and changes.

Might be broken - testing time!