Adding expressions, expressions test, bugfixes