added Form, other minor changes