added memento and fixed bugs
MB