t840 - a few tweaks.