small bunch of mixed updates