hls: Various work on HLS