The code should now run. Some namechanges had to be corrected/reversed. These module additions do not affect the results. Further improvements will be commited at a later date.