Bugfixes; many a bugfix.