few minor imporvements