fixing up some minor issues