Fixed up the data entry form and a few other things.