Update. Mostly minor changes