Cleanup and a bit o' docs