replacing expressions with ast expressions
worked on ast
further ast improvements