Added displayName, get rid of unused settings, better msgs