cosmetics and adjustments

4 jobs for tweak_demos in 19 minutes and 15 seconds