Some Bugfixes.
Added update functions to control-windows.