Added some @Nullable annotations.
Fixed typo in comment.
Some spec updates.