sync with Joel's branch. Modstamps in sets and network are commented out.