slight tidy up after attempt to make dates and forms work more robustly (not worked)