Clean up
minor header formatting
Make Cards subtree creation more robust