fixes for deliverables, new TODOs