Changes by Ben Lamonica and Eric Seidel, reviewed mostly by Eric and