updates to validate.C and wflow maps