minor changes to validation logic.  Got rid of commented code.  Done.