Various changes. added form