Fixing hacky regular expression, starting to fiddle with release-cli build.