Some improvements to effective tool checking and ore checking