Fix timeline, add debug output