removed outdated todos, updated comments