updated todos
Expanded comment shema