partial javadoc, got rid of old asts, working