more mws tweaks