Added RelayResolver and cleaned up a few little things.