more changes and various places