addressing review comments, compilation with hcat 0.12 and stuff