more typing issues fixed