Removed various @todo tags from the code, moved them to Trello.