Minor bugs + Local stoarge