Fix DSR bugs, improve simulator logging.