fixing task and form generation