added some stuff, sprinkled  all over the place