fixing some things