Fixed pluralization, Javadoc, Nullable, and static import stuff.