better title-fetching + cleanup