big fixes and featurize