tweaks and a TODO list :-)