fixing a form and some date issues