More changes and window system prototype