final touches; fix data-saving weirdness