some fixes for efwws ..
and more fixes