Update to form and minor fixes