We now create one window per output!

A little bit of syntax cleanup. More to come.