Arithmetic support; fix unification bug

Fix indentation/pretty print