Made stuff more configurable.