fixed some discrepencies