Fixed up makeDateTime to use 18 hours as the end by default