a multitude of bug-fixes