Added swap-quotes
Misc updates