more updates to cfg loading