More various bug and typo fixes.