fixes and time line