fixed up some issues