sync in some more revisions, will do the rest tomorrow