fixed regex, minor changes