fix mismatches, updates & corrections