Bug fixes. Simplified some calls using the new addFormCallback.