Completed with all commented issues.