Fixed old option numbers in ProxyMapping and cleaned up properties.