improved comments/todos