updates and various fixes