Split out configuration & improved moderation