Minor interface changes from Grumble to Sayit.
Various bug fixes.