fixing a few types and commenting out broken low priority code