Polished everything. Smaller more regular commits to follow.