some inprovements