Fix #6, work on #53, LocalSettings cleanup