fixed form + few other issues