New settings management, minor bug fixes