add a lot of SVN keywords, start of main-program rewrite