Further script upgrades, log pretty print