Final edits for v 1.3 (hopefully)