Made proxy info into a map
Fixed a quick bug, took out old code.