Many Bug-Fixes