fix various stuff