Final commit

Touched up minor details