Fix some kicks, cleanup logging.