More Wolfram|Alpha changes, still WIP