Removes TODO's, fixes string comparisson in app according to tasks,
fixes multiple fields handling
Updates TODO's