RC7 with some important big fixes