tweaks to save all functionality + extra logging