Everything works!

Still a few obscure bugs that I can't reproduce 100% of the time...