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

sthapaun/toolbox,jonboulle/toolbox,ianbytchek/toolbox,Reality9/toolbox,coreos/toolbox