Return correct artifact regex in toString()
Various trivial fixes