rewrote some of drafty things