More minor changes by Vic