Adding a demo project, and a few tweaks after testing.

Overall this looks pretty good, but no doubt will need a bit more
tweaking soon.