some fixes + hb without exe