Correct last tweak, plus some new tweaks