Added proxy(), fixed reference errors, ...