Fix issues #1 and #3

Multiple windows & tabs function as expected.