Fluent configuration and minor improvements.