MEDIUM / Fixed minor issues + EPI inspector