minor form improvements