fixed more package stuff