resolving el-api conflict
fixing some regex mistakes