small tweaks and FIXME fixes to documentation.