added some comments/todos