hard won, minor speedups