Improves Level 1 design and general code improvements.