minor form imporvements