v3.7 - wonder tweaks