Localstorage Test 2 + Other changes