Suggested corrections

Check the TODO lines