fixing various things