some more improvs