fix stuff
cosmetics
halway through a decent layouter, random for now. all tests pass
more layout restructuring
test both layouters
fix typos and get it going