DERP

I retire for today.
Merge pull request #2 from gnustomp/master

changes - thing and DERP and a few others.