various fixes and updates