Removed failing references to private class members, Added missing paramters miscellaneous other errors