added/updated comments