changed packages, various fixes