added in javadoc information and style fixes