wip
removed multiple windows and fix errors left