fix bugs in the indicators and core