minor fix and regex validator