A few comments removed/changed.