update after svn commit & some tweaks