Added Wolfram|Alpha plugin and cleaned up some code