agh, extra spaces.
fix a bunch of regex. thanks @arumata!