Some enhancements and bug fixes

I like the pull request per issue approach I was using, but it has a little too much overhead...