Updated run descriptions
Added javadocs and made diamond types explicit