Clean up some minor crud.
Fix a bunch of bugs in prompting and stuff.
A small step toward saner errors.
Various fixes and improvements.