cleared up some types