Cleanup, and getting things to work. Also giving up on most of the parodying