Antilag 2: electric boogaloo

forgot to make a pullreq 2 weeks ago so here it is, updated with fresh master