Added timer check back, fixed some bugs