added todos for corrections