Content updates and various fixes