minor comments & todo update