added edge case checks, starting on today/tonight mapping