added some stuff, mostly from GP, but also from Griffin...