add remaining stuff from svn