add some TODOs
amend a TODO
try to improve mobile experience