some fixes re: variables and unary operator