few additional improvements