Updating documentation, fixing Java7 warnings