resolve some TODOs; minor UI tweaks