no more comparing strings with == and cleaned up some old TODO comments