More work on javadocs and proxy hierarchy