fixing numerous small infelicities