added some todos
comments, todos