Some final minor changes