fixing up localstorage and stuff
fixing up localstorage and stuff and merging