form edits

Review once more.