More nighttime improvements