Level 1 shaping up + major fixes