fixed all escape issues