svn base and some minor adjustments