Various updates & Bug fixes