code review, added todos