fix some issues
Add loading + redo evaluation