Quote bug fixes and quote style added