various small tweaks and TODO notes