more package tweaking