diverse important fixes