overhaul delform, add toolbox