Touchups

@rail I addressed the issues you'd mentioned earlier. This isn't really a true plugin system, since it's not configurable, but it could be made so with just five or six lines of code (I'm not sure if having that option would be useful for now though, and I'm not a fan of adding features which won't be used). Thanks you for the advice and keep it coming!