quotes added, general fixes