few improvments