GHP-1 Update

Magic numbers removed, and small fixes