Various edits to el core