Bigger update - plenty of tweaks

All around the library...