lens and type cleanup
add presence Tracker