Add some dependencies
Work on some assorted javadoc comments