Updated todo with suggestions and notes