One == changed for an equals (== or != is not the equivalent to .equals method, == and != deal with references, like pointer in C++, it doesn't read the value)
One TODO and one FIXME added