Numerous updates and cosmetic patches