expressions fix; line counter fix;