fixing some stuff in the form