Got option save / restore working
Tweaking save code