add proxy2 and minor cleanup