More docs and TODOs