made some changes to form gen