reverts chapel, fixes up some more lattices