Updates 17102013

Many updates