Small fixes and some more tests, Memento player tested