fix up trim and space tools