Fixed HFE
Added more plotting