fixed the crashing bug, redid some timings