Bugfix solution and Argus Plugin

Fixed the solution and argus Plugin.
My last pull request was a mess. .....

@LukePulverenti