Fixed mixed quote issues and arg to argument