Better timer checkage and new functions