bugs improvements

included HEC0 and HEC1
possible combinations
other bugs