More use of configuration
Bug fixes for initialization