expression, bugfixes