Var name changes, some small color adjustments.