small changes in various places