Finished replay mode plus couple minor fixes