rst and sh fixes