Updates to multi-window

Just to have an overview of what I changed. I commented some stuff instead of removing it. So feel free to remove these lines, or really just to manually apply the changes.