Final fixes.
Added GHP.