fix(toolbox): updates and fixes based on marineam's feedback