Chapter numbers and assorted fixes