Fixes and implemented the WindowMapper