added a few todo comments