lots of bug fixes for DREAM5 data-based EGRIN 2