fixing various stuff