3.8.2 bigfix and tweaks