ensure we always use getCellHtml
reshuffle some code
add some extra goals and boxes