finished the TODOs, small things: ready for inspection !!!