mostly time-lapse fixes