HoR: more stuff
HoR: some corrections