fixing some this/that