Integrate payment importer

Integrated payment importer, minor bugfixes, code cleanup