made stuff more configurable