Some things fixed, still problems with EL
Some things fixed, still problems with EL