Fix account regexes to stop matching comment lines

Also allow any space after status markers (!*)