small fixes + packed version