finished TODOs in the user guide