fixes on pw view