- adding the various changes from code inspection