Better LocalIndicator + Bugfixes.