pulling in some changes from svn