adding missed changes from last svn commits