Updated tool load verification and minor changes to increase speed