bugfixes
started to refactor expression evaluation