more cleanups
fix broken tests
remove toggle from quine (sadly, prevents it from being a quine)