Version 1.7 tweaks