Fix some bugs with #2 re REVISIONTIMESTAMP…others still present, though