form - fixed some things
form - made code much shorter