Better save/load API
Behavior and style fixes