Add some nifty docs

I just used this to debug #483
Fix #493