add some more stuff
added functions in Expression class to replace values and check if a function or not before the replace