fixed some forms and stuffs