a number of updates, including return of config.xml
a few more minor updates