fix comments, mark todos