small imporvements, check with joh
small imporvements, check with joh2