Fixed minor issues, added HB output for checking later