NXBOOK-722 read through the lot and did lots of minor improvements and additions, ready for first QA imho