doc and TODO tweaks