adding settings, fixing findbugs