Better timer and fixes dealloc