Fixed build problems & added storage.js