Updated input checks/validation