fix window mappings and add Gundo