updates package + small fixes