Configury updates.
Whitespace
Compiler nits.