Some updates for replays and fix bugs in submit