fixed typing issues