misc: correcting the form (part 1)