cleaned up some of the symbol conversion stuff, then changed name of a
few thing