fixed some more bugs, added more tests and removed the timer