New SWIM plugins, bug fixen.