fixing some things 3