Wolfram|Alpha update

Code cleanup, fix some obvious bugs