Fixes #219, more work on browser storage