- adding the various changes and big fixes