Cleanup and finished adding replay output