Brought text renedering up to date with test branch