fix packageS
fix more package issues