Further changes for git compatibility- CB lists, rev number as string, better cmd lines