Added fixed logic for == op, still need to format erros correctly