Edit some glitches following the hw5 feedback