Small tweaks, finish up