small bugfix, streamlined, and update of toolbox