fix arrival data and stuff
arrival data
Merge branch 'master' of https://github.com/luketao/comp7615-project