updating all (\s|[()]) to ([\s()]). much cleaner
fixing some padding/regex issues (also uncommenting number formatting)