added "else"  translation
cleaned up code and updated TODO file
added "And", "Or" operators translation