updated with Jeffreyg changes

incorping full changes from June that Jeff Gollnick did.