fix various things