few more improvments