added mostly complete data for this config
fixed merge conflicts