commiting to master latest bug fixes in hoard analysis from CHRR