Local storage cleanup & bug fixes.