Moved around/fixed up some builder tools