Fix ternary op and add comparison operators everywhere