DOC: Update handle and tweaks.