v1.7.1 - CSV switch and tweaks