E1S4: cleanup, progress, and modifications