updated to latest BuildReport with fixes and improvements