Add final round of polish-ups