Work on ELDP profile, bugfixes