REFS:#255 some minor changes