Made the default configuration more default-ish