Refined a few things; still going.