Changed service indicators to remedy slew of problems #28 #24