More documentation and TODOs