Some configurable components & fixes