A few changes suggested by Max and Sahir