Updates and bug fixes for issues related to the validation class. #24