Remove "him" placeholder text, and a few other misc changes