Unleak function definitions
Remove stray characters
Merge pull request #3 from hughsk/tweaks

Tweaks