Fixed import and tested with real-world data. Still some discrepancies in the results to work out (wrong proceeds calculation, inconsistent user numbers, overall slightly odd results)

Also worked on the command line tools
Updated the develope reference