more encoding tweaks