fixing various small errors