minor big fixes