Cleanup info logging.  Fix main.