More bug fixes. Configuration default changes.