lint
small tweaks - and TODOs