Hwrclassy

some small errors in the output parts fixed