More tool fixes and nerves