LocalStorage clean-up plus bug-fixes.