Fixed a mc()-bug and added correct reading of fermi-style xml-files
Do some minor code reformatting to apply to coding standards.