Minor docs cleanup and remove TODOs