updated to newest code from svn
added rest of svn