various fixes from the past 3 months of live usage