added some nice bits.