javadocs and commenting updates