added a bunch of toolage