Update timing routine
Add TODO comment
Minor changes to Makefile
Update ctor (initial posizions and speeds, collision times)