E1S7: general cleanup and dialog revision