add package, some fixes