add some stuff that was in the toolbelt's master