Various changes, paper draft