Beautified.
Fixores minores.
Merge pull request #248 from xi-project/final-pass

Final pass