more typing fixed