fixes up some issues