Half of final "e" bugs

Fixed half of final "e" bugs. Step 5 test passes.