- We can now set a 'mapping config' xml file to load at start up.
- Did some cleaning.