+goalForm
fixes