fixed bugs,etc and added global timeline of events