forms + few changes