Some comments added/replaced