Adding uris and forge headers
Cleaning up waf scripts