Still bugfixing.  Merge this away.