Small fixes. First use of local storage