Updated for nightly build 923f1c8.
Fixed class comments and a bug.