some work towards dynamic commands, fix wolfram text
remove crap