Bug fixes, history, cleanup, logging, etc.