cleaned up the strings
fixed up abstract proxies