More text work plus some cleanup/enhancement