Bug fixes and simplified some calls using the new addFormCallback.