Many Bug Fixes