Unary operators added, main modified to check