- fix small issue that guards against user input.
more small fixes