Re #13, update some copy