pushed fixes from daniel to 1d and 1e