mathematica implemented; tweaks