- Some final changes based on Brett's merge comments.