Correct required property of input form.
Remove most of TODO reminders.