EG: added config + latest fixes