Various notes and tweaks getting ready for re-write