Add date and tidy up disconnect.