Re-include scripts

Lots of misc changes to improve the output

Change-Id: I931f80240b15a28e79da05868aaa9f9a019b0218