fix some branch revisions; add rules