minor tweaks and TODOs