NPI nuemric value fixes, spelling fixes