removing todo, adding +, and other edits