fixing some things in various places