fixes + new pdf gen