Added implicit multiply on functions and variables
Added then removed implicit multiply for e and pi