BugFix

After extensive Bugfixing, I'd like to call this plugin "done", at the
moment.

May add more features, later.