Some more doc, TODOs, notes