minor bug fixes plus settings update