Sixth exercise, basic improvements to the general scripts.