Various fixed by fjsimons-at-alum-mit-edu