first round of fighting javadoc errorsr