Add bare mode. Clean out wrong single-quotes.