fixes simulation

cleanup was happening too eagerly
regifies layout
more layout rejiging