yet more huge fixes