63421162 wwr enhancements

@DavidGoldwasser Here are fixes for #876 and translation to E+