added some additional config following ultrabug's advices