More progress on config parsing