Fixed hopefully all quoting bugs now