updated waf scripts and README