two fixes: map and feed
update todo