lesser changes on eclasses + live xsp (currently failing to build, need aclocal fix)