Ripped out printer, log enhancements, cleanups...