multitude of fixes