Adding faculty checks, finer checking for other reg-ex based checks