more work
Fixes after conf-call, some TODOs remain