some comments, todo checklist tweaks