small imporvements, comments