Level 1 minor changes + todo