Cleaned up the code for gehd2.  Fixed bug in lahr2.