Fixes some typos and re-orders required fields