More reviewing. Small changes, added todos'