resolved minor issues