form flow
validation fixes