minor changes to various places.