1ctf, r1ctf, and a bunch of improvements + fixes