Input Validation optimised

Still doesn't actually check for validity, but input itsself is even
more restricted
More input validation