Steve's fixes/fiddling with the forms