General corrections
Policy coverage script & sql
ERModel update