resolved some discrepencies