added energy comparison for GtoG; rewrote GtoD (needs testing); moved some things around