EW/WE: Updated

Some fixes for prevoius fixes, and some new fixes for old unfixed issues. Stay fixed.