added hh support and some channel stuff