Added some more field checking for inputs