more target updates plus some intermediate fixes