many fixes for HTHW