cleanup, ritual union, more general layout