fix some updates & remove unused stuff & update indicator-data call