Some comments added or modified