Added unary op support + mis changes.