CR fixes
Fixed typo + removed MesageBoxes