some additional improvements