Various fixes, and turn lights on 20 minutes before sunset (which seems to be the trigger when my wife starts to whine about lights)