support ota restore of auto consumption data

and some other misc stuff. commit by commit should be readable