more javadocs and clean up of bulk-fetch code