Preliminary implementation of objective health indicators, several updates and performance improvements