update various fixes