fixed some issues with quotes