Round of bug fixes.
Still many more remaining.