Simple mode

These commits bring a fully working simple mode and all of the changes needed to make it happen. Also a few random bug fixes, etc.