1.1: fixed problems from the last refactoring, got the plugin into a much more useful state than it was