Many fixes to begin to get word-for-word rendering finished