Minor updates for ThoughtBubble, and added some TODOs