Cornsilk 13 16 acu122331 user data robustness

@dominicm @robertsulway 
I fixed two issues here and bumped the version to 0.7.1. When this merges to master we should change the version to 0.8.1.