Timeline transitions done, more type ups