minor changes to several files