updated class headers, javadocs