Sorting out valid number steps and adding missing validation.