night and day and some other fixes