Basic tinkering

A few little changes from my unsuccessful attempts to expand the
simulation.