removed some minor issues