Small fixes / organizing Mathematica.scala