More updates
All changes from EG
Clean run on midasr 0.2 version
Hopefully harmonized version
updated version