EJPLUGIN-157;  clean up and fixed issues