caribou: general tweaks.