fixed so timer works, and status are updated properly