Some updates and fixes and corrections