cHP bug fixes and some display changes