Final minor fixes. Looking good now.