Level 1 fixes & extend