Minor changes including localStorage updates and extending features