Many Bug fixes