bug fixes, multi-window