updating: bolding some things, proper soft-returns?