some bugfix; + test_hl