Finally merge the remaining bits of rsharman's patch
Small bit of debug info

There's also the matter of fixing up the source for warnings.
Probably lots of liberal use use of ^(n|l) str functions.
Merge pull request #4 from NattyNarwhal/integration

Integrate remaining