Fixes, added support for any number of windows