A couple of the things you've pointed out do need addressing. I'll get around to making an update as soon as I'm able. Thanks for the feedback.
