clean up a few things, work towards re-implementing mine stuff with
sub-components/etc to manage multiple workers.