Fix and improve wrun-status