Updates based on feedback from Ocramius

Addresses all comments made so far, except the one about persists/updates