-- documentation tweaks and more TODOs