Minor adjustments.
Started using the feedback context.