fixes from Nico's feedback; properly unmount charts