Some comments added/changed.