Some comments/todos added