o.c.u.toolbox: fixes for TOOL-2, TOOL-3 and TOOL-4
o.c.u.toolbox: minor code cleanup for TOOL-2, TOOL-3 and TOOL-4