fixed some problems with quotes