some more changes with Winverse