added the ability to complain
added check to make sure fields are used
fixed logic to check if both fields were filled in