tools fixes, grabber added