some more improvments