indicators: now with more caching
a few code inspections across the board