edited forms, fixed attribute names