add few comments/todos