Fix quoteWidth bug; minor cleanup