little fixes and factorisation for settings