Further refinement

A little bit of everything. Still working on stuff.