more typing improvements