few things added or fixed