fixed some issues with ' and " symbols