fixing up some issues