Some r?'s addressed.

todo:
* add the MaxRecord tweak for storage
* switch proping data to rawmessage