added window, copy all mappings; a wee cleanup