minor fixes to first three phases