add cast and a few text ammends