Tweaks, mostly suggested by Alex Stangl. Rip out huge copyrights.