Minor cleanups.
Basic support for single individual samples.
Minimum updates to enable n=1 simulations.