Regexp edits and cmd method edits

tests are now passing