minor form changes