a lot of minor imporvements