Cursory pass, minor edits. Still keeping the lock until tuesday.