resolved some minor issues