Adding multiple updates and fixes