Added ongoing and dateformat to Activity Values.  Better validation.
Delete empty Activites if cancelled.