mostly minor changes