More validation fixes

Have to figure out how to make input field not convert numbers into
strings.