Card #96 edit and new fixes, more robust save