Karen/crossword fix

@mdayaram @jkaihsu 

Some small fixes, best viewed commit-by-commit.