bug fixes where the timelines were shifted a bit incorrectly, timewise