fixed database errors, added new indicators