Minor enhacements for the r2wui