regexps for complex fields, cosmetic fixes